(c-fill-paragraph): Don't include part of comment

terminator in the fill-prefix.

diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el
index 91016c99b9b9a053bdf16fed1438bad6fa287e6c..a2478b6edfa7af3b5edef62bab7e0c2d5fb4743e 100644 (file)
--- a/lisp/progmodes/c-mode.el
+++ b/lisp/progmodes/c-mode.el
@@ -386,6 +386,11 @@ preserving the comment indentation or line-starting decorations."
                                     (point))))
                              (beginning-of-line)
                              (skip-chars-forward " \t*" max-prefix-end)
+                             ;; Don't include part of comment terminator
+                             ;; in the fill-prefix.
+                             (and (eq (following-char) ?/)
+                                  (eq (preceding-char) ?*)
+                                  (backward-char 1))
                              (point)))
 
                         ;; If the comment is only one line followed by a blank